-
Notifications
You must be signed in to change notification settings - Fork 62
Restore deleted deviations suppression query #876
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Restore deleted deviations suppression query #876
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull Request Overview
This pull request restores the previously deleted DeviationsSuppression.ql query by adding a corresponding change note.
- Restores the DeviationsSuppression.ql query used for generating the Guideline Compliance Summary
- Adds a change note to document the restoration
Files not reviewed (4)
- cpp/common/src/codingstandards/cpp/deviations/DeviationsSuppression.qhelp: Language not supported
- cpp/common/src/codingstandards/cpp/deviations/DeviationsSuppression.ql: Language not supported
- cpp/common/test/deviations/deviations_report_deviated/DeviationsSuppression.expected: Language not supported
- cpp/common/test/deviations/deviations_report_deviated/DeviationsSuppression.qlref: Language not supported
Tip: If you use Visual Studio Code, you can request a review from Copilot before you push from the "Source Control" tab. Learn more
This is required for our reporting scripts. Changes implemented to support reporting of locations and messages for new deviation formats.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, just some small points to bring up!
cpp/common/src/codingstandards/cpp/deviations/CodeIdentifierDeviation.qll
Outdated
Show resolved
Hide resolved
cpp/common/src/codingstandards/cpp/deviations/CodeIdentifierDeviation.qll
Show resolved
Hide resolved
or | ||
this = TMultiLineDeviation(_, _, _, filepath, suppressedLine, endline) and | ||
suppressedColumn = 1 and | ||
endcolumn = 1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some potential inconsistencies. Firstly, the suppressed area includes the text of the first comment, but ends before the text of the second comment.
Additionally, it looks like:
// codeql::misra_deviation_begin(foo)
non_compliant_code // codeql::misra_deviation_end(foo)
neither deviates the non_compliant_code
nor triggers an invalid deviation warning. The deviated location matched here would not include non_compliant_code
either.
Do you think either of these are an issue worth filing or fixing?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great catch. I've rewritten the multi-line deviation to start at the start column of the begin marker comment, and end at the end column of the end marker comment.
The deviated locations now include the line with the _end marker, for any element before the marker.
Ensure begin/end column code works as expected
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch on the Attribute primary suppressed location logic!
Description
I incorrectly deleted the
DeviationsSuppression.ql
query in #807. This query is still used as part of generating our Guideline Compliance Summary, and is useful for customers wanting to generate a SARIF file including suppression information.Change request type
.ql
,.qll
,.qls
or unit tests)Rules with added or modified queries
Release change checklist
A change note (development_handbook.md#change-notes) is required for any pull request which modifies:
If you are only adding new rule queries, a change note is not required.
Author: Is a change note required?
🚨🚨🚨
Reviewer: Confirm that format of shared queries (not the .qll file, the
.ql file that imports it) is valid by running them within VS Code.
Reviewer: Confirm that either a change note is not required or the change note is required and has been added.
Query development review checklist
For PRs that add new queries or modify existing queries, the following checklist should be completed by both the author and reviewer:
Author
As a rule of thumb, predicates specific to the query should take no more than 1 minute, and for simple queries be under 10 seconds. If this is not the case, this should be highlighted and agreed in the code review process.
Reviewer
As a rule of thumb, predicates specific to the query should take no more than 1 minute, and for simple queries be under 10 seconds. If this is not the case, this should be highlighted and agreed in the code review process.